Fix block backend teardown when the device didn't setup completely.

Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>

diff --git a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
index 080f1a8e17a293a5b86a2f17b172508c9718012d..30a47031b9bf7252ef477de60403fc7294e0d4cf 100644 (file)
--- a/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
+++ b/linux-2.6-xen-sparse/drivers/xen/blkback/interface.c
@@ -123,11 +123,10 @@ static void free_blkif(void *arg)
        blkif_t *blkif = (blkif_t *)arg;
 
        /* Already disconnected? */
-       if (!blkif->irq)
-               return;
-
-       unbind_from_irqhandler(blkif->irq, blkif);
-       blkif->irq = 0;
+       if (blkif->irq) {
+               unbind_from_irqhandler(blkif->irq, blkif);
+               blkif->irq = 0;
+       }
 
        vbd_free(&blkif->vbd);